Disconnect from prev_action, not from action. (Fix by David Hampton)

2003-09-06  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkaction.c (gtk_action_connect_proxy): Disconnect from
	prev_action, not from action.  (Fix by David Hampton)

diff --git a/ChangeLog b/ChangeLog
index fd3ed86a32d6fd2136f81dae87731a97bb067db4..03380a5970f793990b6e306194174d4601734461 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2003-09-06  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkaction.c (gtk_action_connect_proxy): Disconnect from 
+       prev_action, not from action.  (Fix by David Hampton)
+
 Fri Sep  5 14:15:10 2003  Owen Taylor  <otaylor@redhat.com>
  
-       * Back out locale-dependent interpretation of
+       * Back out locale-dependent interpretation of
        KP_Decimal, the official XFree86 interpretation
        is that KP_Decimal => . KP_Separator => ,
        always, independent of locale. 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fd3ed86a32d6fd2136f81dae87731a97bb067db4..03380a5970f793990b6e306194174d4601734461 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,11 @@
+2003-09-06  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkaction.c (gtk_action_connect_proxy): Disconnect from 
+       prev_action, not from action.  (Fix by David Hampton)
+
 Fri Sep  5 14:15:10 2003  Owen Taylor  <otaylor@redhat.com>
  
-       * Back out locale-dependent interpretation of
+       * Back out locale-dependent interpretation of
        KP_Decimal, the official XFree86 interpretation
        is that KP_Decimal => . KP_Separator => ,
        always, independent of locale. 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fd3ed86a32d6fd2136f81dae87731a97bb067db4..03380a5970f793990b6e306194174d4601734461 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,6 +1,11 @@
+2003-09-06  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkaction.c (gtk_action_connect_proxy): Disconnect from 
+       prev_action, not from action.  (Fix by David Hampton)
+
 Fri Sep  5 14:15:10 2003  Owen Taylor  <otaylor@redhat.com>
  
-       * Back out locale-dependent interpretation of
+       * Back out locale-dependent interpretation of
        KP_Decimal, the official XFree86 interpretation
        is that KP_Decimal => . KP_Separator => ,
        always, independent of locale. 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fd3ed86a32d6fd2136f81dae87731a97bb067db4..03380a5970f793990b6e306194174d4601734461 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,6 +1,11 @@
+2003-09-06  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkaction.c (gtk_action_connect_proxy): Disconnect from 
+       prev_action, not from action.  (Fix by David Hampton)
+
 Fri Sep  5 14:15:10 2003  Owen Taylor  <otaylor@redhat.com>
  
-       * Back out locale-dependent interpretation of
+       * Back out locale-dependent interpretation of
        KP_Decimal, the official XFree86 interpretation
        is that KP_Decimal => . KP_Separator => ,
        always, independent of locale. 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fd3ed86a32d6fd2136f81dae87731a97bb067db4..03380a5970f793990b6e306194174d4601734461 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,6 +1,11 @@
+2003-09-06  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkaction.c (gtk_action_connect_proxy): Disconnect from 
+       prev_action, not from action.  (Fix by David Hampton)
+
 Fri Sep  5 14:15:10 2003  Owen Taylor  <otaylor@redhat.com>
  
-       * Back out locale-dependent interpretation of
+       * Back out locale-dependent interpretation of
        KP_Decimal, the official XFree86 interpretation
        is that KP_Decimal => . KP_Separator => ,
        always, independent of locale. 

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 1be5c5aae7ac7464ffe8637d6f18cd73864b86a8..926cc1b4ac5372af7362d1f524878e206dac483e 100644 (file)
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -814,9 +814,7 @@ gtk_action_connect_proxy (GtkAction *action,
   prev_action = g_object_get_data (G_OBJECT (proxy), "gtk-action");
 
   if (prev_action)
-    {
-      (* GTK_ACTION_GET_CLASS (action)->disconnect_proxy) (action, proxy);  
-    }
+    (* GTK_ACTION_GET_CLASS (action)->disconnect_proxy) (prev_action, proxy);  
 
   (* GTK_ACTION_GET_CLASS (action)->connect_proxy) (action, proxy);
 }